Don't crash if icon_theme_builtin_icons hasn't been initialized. (#128726,

Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
	icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
	Gonzalez)

diff --git a/ChangeLog b/ChangeLog
index 79f22690d854c3a840b906af40f56e17acaa3fdd..ee3b9a6db1ad19ce6a2b62a8f36b7a2c98a607a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
+       icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
+       Gonzalez)
+
 2003-12-07  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 79f22690d854c3a840b906af40f56e17acaa3fdd..ee3b9a6db1ad19ce6a2b62a8f36b7a2c98a607a4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
+       icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
+       Gonzalez)
+
 2003-12-07  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 79f22690d854c3a840b906af40f56e17acaa3fdd..ee3b9a6db1ad19ce6a2b62a8f36b7a2c98a607a4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
+       icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
+       Gonzalez)
+
 2003-12-07  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 79f22690d854c3a840b906af40f56e17acaa3fdd..ee3b9a6db1ad19ce6a2b62a8f36b7a2c98a607a4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
+       icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
+       Gonzalez)
+
 2003-12-07  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 79f22690d854c3a840b906af40f56e17acaa3fdd..ee3b9a6db1ad19ce6a2b62a8f36b7a2c98a607a4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
+       icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
+       Gonzalez)
+
 2003-12-07  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index f9f5070826f804b781ca893820c8810f2d37e0ce..533e8cffef0ad42a022af94e92895e3d1e35e125 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1252,7 +1252,9 @@ gtk_icon_theme_has_icon (GtkIconTheme *icon_theme,
   if (g_hash_table_lookup_extended (priv->all_icons,
                                    icon_name, NULL, NULL))
     return TRUE;
-  if (g_hash_table_lookup_extended (icon_theme_builtin_icons,
+
+  if (icon_theme_builtin_icons &&
+      g_hash_table_lookup_extended (icon_theme_builtin_icons,
                                    icon_name, NULL, NULL))
     return TRUE;